Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename rustc_middle::cstore::DepKind to CrateDepKind #75054

Merged
merged 1 commit into from
Aug 2, 2020

Conversation

cjgillot
Copy link
Contributor

@cjgillot cjgillot commented Aug 2, 2020

It is ambiguous with DepGraph's own DepKind.

@rust-highfive
Copy link
Collaborator

r? @matthewjasper

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 2, 2020
@petrochenkov
Copy link
Contributor

It is ambiguous with DepGraph's own DepKind.

Is this a big deal?
I'd rather keep this as is or rename to CrateDepKind.

@cjgillot cjgillot changed the title Rename rustc_middle::cstore::DepKind to DependencyKind. Rename rustc_middle::cstore::DepKind to CrateDepKind Aug 2, 2020
@cjgillot
Copy link
Contributor Author

cjgillot commented Aug 2, 2020

Searching for uses of dep_graph::DepKind requires to filter out this other type.
In addition, this requires some import gymnastics to avoid having both conflict.

@petrochenkov
Copy link
Contributor

r? @petrochenkov @bors r+

@bors
Copy link
Contributor

bors commented Aug 2, 2020

📌 Commit 4d4b8f2 has been approved by petrochenkov

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Aug 2, 2020
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 2, 2020
Rollup of 10 pull requests

Successful merges:

 - rust-lang#74686 (BTreeMap: remove into_slices and its unsafe block)
 - rust-lang#74762 (BTreeMap::drain_filter should not touch the root during iteration)
 - rust-lang#74781 (Clean up E0733 explanation)
 - rust-lang#74874 (BTreeMap: define forget_type only when relevant)
 - rust-lang#74974 (Make tests faster in Miri)
 - rust-lang#75010 (Update elasticlunr-rs and ammonia transitive deps)
 - rust-lang#75041 (Replaced log with tracing crate)
 - rust-lang#75044 (Clean up E0744 explanation)
 - rust-lang#75054 (Rename rustc_middle::cstore::DepKind to CrateDepKind)
 - rust-lang#75057 (Avoid dumping rustc invocations to stdout)

Failed merges:

 - rust-lang#74827 (Move bulk of BTreeMap::insert method down to new method on handle)

r? @ghost
@bors bors merged commit 595a2f5 into rust-lang:master Aug 2, 2020
@cjgillot cjgillot deleted the rename-depkind branch August 3, 2020 12:34
@cuviper cuviper added this to the 1.47.0 milestone May 2, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants